Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] [FIX] Fixes Kick Damage #616

Merged
merged 1 commit into from
Nov 14, 2023
Merged

[MIRROR] [FIX] Fixes Kick Damage #616

merged 1 commit into from
Nov 14, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: Skyrat-SS13/Skyrat-tg#24996

About The Pull Request

They now no longer instantly fracture bones upon use.

How This Contributes To The Skyrat Roleplay Experience

“An external style, Leisure Kicks is chiefly concerned with the sole use of the feet and legs to inflict powerful and rapid blows upon the opponent. The hands are reserved for killing blows only. The style is rare but its practitioners are extremely devoted.

The style is said to originate with the rogue Long Boxing master Kin Kiran. While abbess of her order she was accused of extravagance and over-indulgence by her subordinate monks. She took bribes for blessings and temple offerings and became well known for her love of gifts, wine, and luxury, plying her favors with the local magistrates to great effect. A rebellion within the temple took thirty lives and saw her exiled, beaten, bloody, and with her head shaved and fine silk abbess’s robes torn into shreds.

Kin Kiran swore from that day that she no longer deemed any martial artist worthy of her fists, and instead she would crush all who came before her under the bottom of her feet. Her arrogance was so extreme she established her own school after working as an itinerant mercenary for some time and soon drew a devoted following, resuming many of the corrupt and debased practices as former abbess. The mountain town about her school soon became a heaving den of sin and treachery, defended by rogues and bloodthirsty mercenaries, and ruled by the bloody and debauched abbess, flush with political power and coin, who was so skilled in martial arts that she could decapitate a man by kicking his head off faster than the eye could see.

The rogue school and Kin Kiran were ultimately destroyed by the mendicant knight Weishu Haoyang in 530 S.C. with use of his Invincible Heavy Crashing Wave technique. The abbess and all hundred and thirty of her acolytes were hurled off a mountain and dashed against the rocks, but her style survives to this day, despite efforts to stamp it out.”

Proof of Testing

Screenshots/Videos

image

Changelog

🆑 Nerev4r
fix: Kicks are no longer supercharged by the dark energies of the Satsui no Hado, making them no longer do a billion damage.
/:cl:

* holy shit yeah

* Update code/modules/mob/living/carbon/human/_species.dm

---------

Co-authored-by: Snakebittenn <[email protected]>
Co-authored-by: Bloop <[email protected]>
@ReezeBL ReezeBL merged commit aac7245 into master Nov 14, 2023
24 checks passed
@ReezeBL ReezeBL deleted the upstream-mirror-24996 branch November 14, 2023 08:03
AnywayFarus added a commit that referenced this pull request Nov 14, 2023
Iajret pushed a commit that referenced this pull request Jan 25, 2024
* General maintainence for Ore Silo (#81016)

## About The Pull Request
1. **Qol**(Hopefully not an issue for feature freeze)
- Adds Screen tips & examines for screwdriver, crowbar & multitool acts
   - Examining ore silo will now display its stored materials
- Location name is attached to the machine name and it greys out when
pausing the machine to make it more noticable that it is paused
   - Made window wider

2. **Code Improvements**
   - Auto docs procs & vars for ore silo log entry
- Fixed return values of all tool acts i.e. no more returning
`TRUE/FALSE` but the actual item interaction flags
- UI no longer computes `REF` for each machine which is expensive but
instead uses the index value in the list
   - Moved global variables to their corresponding files
- Ore silo no longer starts processing round start. That proc just ended
itself anyway so why even bother registering

3. **Fixes**
- If a machine was disconnected via the ore silo UI, attempting to
reconnect that machine would cause a runtime at `RegisterSignal` in
`multitool_act` because it was already registered in `Initialize`. It
now unregisters the signal when disconnecting so that's fixed
- Each machine element in the UI does not have a unique key because it
used `key={machine.name}`. This meant after disconnecting a machine the
UI buttons would get grouped together and the pause & disconnect buttons
would not function properly. Now it uses `index` which is unique thus
fixing that problem

## Changelog
:cl:
qol: added more screen tips & examines for ore silo, made UI wider,
attach location name to each machine & grey out paused machines to make
it more noticeable.
code: auto docs proc & vars for silo log entry. Fixed return values of
all tool acts
fix: ore silo UI now functions correctly after removing an entry from
the UI
fix: no runtimes when connecting a machine to silo that was previously
disconnected via the ore silo UI
/:cl:

* General maintainence for Ore Silo

---------

Co-authored-by: SyncIt21 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants